Make header mismatch checking more robust against build time changes in

xen/include/public/foreign.

Unfortunately diff's -x and -X options do not support excluding paths just
individual files so we have to list unqualified filenames. This is ok for now
since there are no filename clashes.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/buildconfigs/interface.exclude b/buildconfigs/interface.exclude
new file mode 100644 (file)
index 0000000..1df89a5
--- /dev/null
+++ b/buildconfigs/interface.exclude
@@ -0,0 +1,7 @@
+*.size
+*.pyc
+checker
+checker.c
+ia64.h
+x86_32.h
+x86_64.h

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index a0e4fa89f1a6a7bc02e40eec5475f7e4aec871df..678a7706008ccee376672090981e2469ac019d26 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -28,7 +28,8 @@ include buildconfigs/src.$(XEN_LINUX_SOURCE)
 .PHONY: build
 build: $(LINUX_DIR)/include/linux/autoconf.h
 ifneq ($(XEN_LINUX_ALLOW_INTERFACE_MISMATCH),y)
-       @if ! diff -urN -x '*.size' $(LINUX_SRCDIR)/include/xen/interface xen/include/public ; then \
+       @if ! diff -urN -X buildconfigs/interface.exclude \
+              $(LINUX_SRCDIR)/include/xen/interface xen/include/public ; then \
                echo "" 1>&2 ; \
                echo " *** $(LINUX_SRCDIR)/include/xen/interface is out of date " 1>&2 ; \
                echo " *** relative to $(XEN_ROOT)/xen/include/public." 1>&2 ; \